packages/server/utils/getActiveDomainForOrgId.ts (1)

1-3: Organise imports.

Consider grouping the imports logically (external libraries, internal modules, etc.) to improve readability.

+import getKysely from '../postgres/getKysely'
import {DataLoaderInstance} from '../dataloader/RootDataLoader'

packages/server/graphql/queries/helpers/countTiersForUserId.ts (2)

1-3: Organise imports.

Consider grouping the imports logically (external libraries, internal modules, etc.) to improve readability.

// breaking this out into its own helper so it can be used directly to
// populate segment traits
+import {DataLoaderInstance} from '../../../dataloader/RootDataLoader'

---

Line range hint 6-18:
Ensure proper error handling.

The function lacks error handling for data loading operations. Consider adding try-catch blocks to handle potential errors gracefully.

+try {
  const allOrgUsers = await dataLoader.get('organizationUsersByUserId').load(userId)
  const organizationUsers = allOrgUsers.filter(({inactive}) => !inactive)
  const tierStarterCount = organizationUsers.filter(
    (organizationUser) => organizationUser.tier === 'starter'
  ).length
  const tierTeamCount = organizationUsers.filter(
    (organizationUser) => organizationUser.tier === 'team'
  ).length
  const tierEnterpriseCount = organizationUsers.filter(
    (organizationUser) => organizationUser.tier === 'enterprise'
  ).length
  const tierTeamBillingLeaderCount = organizationUsers.filter(
    (organizationUser) =>
      organizationUser.tier === 'team' && organizationUser.role === 'BILLING_LEADER'
  ).length
  return {
    tierStarterCount,
    tierTeamCount,
    tierEnterpriseCount,
    tierTeamBillingLeaderCount
  }
+} catch (error) {
+  console.error('Failed to count tiers for userId:', userId, error)
+  throw error
+}

packages/server/utils/setTierForOrgUsers.ts (1)

Line range hint 1-3:
Remove unused import.

The getRethink import is no longer needed and should be removed to clean up the code.

-import getRethink from '../database/rethinkDriver'
import getKysely from '../postgres/getKysely'

packages/server/graphql/private/queries/suOrgCount.ts (1)

18-19: Remove debug code before production deployment.

The console.log(pgResults) statement should be removed or replaced with a proper logging mechanism before production deployment.

-  console.log(pgResults)
+  // console.log(pgResults) // Uncomment for debugging

packages/server/graphql/private/queries/suProOrgInfo.ts (1)

35-35: Remove debug code before production deployment.

The console.log({pgResults, activeOrgIds}) statement should be removed or replaced with a proper logging mechanism before production deployment.

-  console.log({pgResults, activeOrgIds})
+  // console.log({pgResults, activeOrgIds}) // Uncomment for debugging

packages/server/billing/helpers/handleEnterpriseOrgQuantityChanges.ts (1)

13-14: Use consistent indentation for array elements.

Ensure that the elements of the array passed to Promise.all are consistently indented for better readability.

-  const [orgUsers, subscriptionItem] = await Promise.all([
-    dataLoader.get('organizationUsersByOrgId').load(orgId),
-    manager.getSubscriptionItem(stripeSubscriptionId)
+  const [orgUsers, subscriptionItem] = await Promise.all([
+      dataLoader.get('organizationUsersByOrgId').load(orgId),
+      manager.getSubscriptionItem(stripeSubscriptionId)
  ])

packages/server/postgres/migrations/1720556055134_OrganizationUser-phase1.ts (2)

36-38: Consider index naming conventions.

Consider following a consistent naming convention for indexes to improve readability and maintainability.

-    CREATE INDEX IF NOT EXISTS "idx_OrganizationUser_tier" ON "OrganizationUser"("tier") WHERE "removedAt" IS NULL AND "inactive" = FALSE;
-    CREATE INDEX IF NOT EXISTS "idx_OrganizationUser_orgId" ON "OrganizationUser"("orgId") WHERE "removedAt" IS NULL;
-    CREATE INDEX IF NOT EXISTS "idx_OrganizationUser_userId" ON "OrganizationUser"("userId") WHERE "removedAt" IS NULL;
+    CREATE INDEX IF NOT EXISTS "organization_user_tier_idx" ON "OrganizationUser"("tier") WHERE "removedAt" IS NULL AND "inactive" = FALSE;
+    CREATE INDEX IF NOT EXISTS "organization_user_org_id_idx" ON "OrganizationUser"("orgId") WHERE "removedAt" IS NULL;
+    CREATE INDEX IF NOT EXISTS "organization_user_user_id_idx" ON "OrganizationUser"("userId") WHERE "removedAt" IS NULL;

---

49-51: Ensure proper cleanup in down function.

The down function in 1720556055134_OrganizationUser-phase1.ts does not handle dropping indexes or constraints associated with the OrganizationUser table. Please ensure that all associated indexes and constraints are dropped to complete the cleanup process.

• Add DROP INDEX and DROP CONSTRAINT statements for any indexes and constraints related to the OrganizationUser table.

Analysis chain

Ensure proper cleanup in down function.

Ensure that all associated indexes and constraints are dropped in the down function.

---

Let's search the migration files for any DROP INDEX, DROP CONSTRAINT, or similar statements to ensure proper cleanup in the down function.

Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify that all associated indexes and constraints are dropped in the `down` function.

# Test: Check the table schema after running the `down` function to ensure all indexes and constraints are removed.
psql -c '\d+ "OrganizationUser"'

Length of output: 106

---

Script:

#!/bin/bash
# Search for DROP INDEX, DROP CONSTRAINT, or similar statements in the migration files to ensure proper cleanup.
rg 'DROP INDEX|DROP CONSTRAINT|DROP SEQUENCE|DROP TRIGGER' --glob '**/migrations/*.ts'

Length of output: 8815

packages/server/postgres/migrations/1720640784862_OrganizationUser-phase2.ts (1)

43-44: Initialise cursor values

Ensure that the cursor values curjoinedAt and curId are initialized to appropriate minimum values.

packages/server/dataloader/__tests__/isOrgVerified.test.ts (1)

80-81: Remove redundant null checks.

The removedAt field is already being set to null if not provided, making the null checks redundant. Consider removing them for cleaner code.

-    inactive: member.inactive ?? false,
-    role: member.role ?? null,
-    removedAt: member.removedAt ?? null,
+    inactive: member.inactive ?? false,
+    role: member.role ?? null,
+    removedAt: member.removedAt,

packages/server/graphql/public/mutations/setOrgUserRole.ts (1)

98-98: Ensure consistency in role updates between PostgreSQL and RethinkDB.

The role updates in the setOrgUserRole function are performed sequentially without ensuring atomicity across the two databases. If one update fails while the other succeeds, it can lead to inconsistencies.

• The function updates the role in PostgreSQL first and then in RethinkDB.
• There is no rollback mechanism to handle failures in one database after a successful update in the other.

Consider implementing a transaction management strategy or a rollback mechanism to ensure both updates succeed or fail together.

Analysis chain

Ensure consistency in role updates between PostgreSQL and RethinkDB.

The role update in PostgreSQL should be consistent with the role update in RethinkDB. Verify that both updates succeed or fail together.

Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify consistency in role updates between PostgreSQL and RethinkDB.

# Test: Ensure the role updates succeed or fail together.
rg --type ts 'setOrgUserRole'

Length of output: 1044

---

Script:

#!/bin/bash
# Searching for the implementation of the setOrgUserRole function to verify consistency in role updates between PostgreSQL and RethinkDB.
ast-grep --lang typescript --pattern $'const setOrgUserRole: MutationResolvers[\'setOrgUserRole\'] = async ($_$) => { $$$ }' packages/server/graphql/public/mutations/setOrgUserRole.ts

Length of output: 188

---

Script:

#!/bin/bash
# Searching for the implementation of the setOrgUserRole function and including context lines to inspect the implementation details.
rg 'const setOrgUserRole' -A 50 packages/server/graphql/public/mutations/setOrgUserRole.ts

Length of output: 1928

---

Script:

#!/bin/bash
# Extending the context lines to capture the complete implementation of the setOrgUserRole function.
rg 'const setOrgUserRole' -A 100 packages/server/graphql/public/mutations/setOrgUserRole.ts

Length of output: 3226